Update release numbers for upcomming GPSBabel 1.3.

diff --git a/win32/gui-2/GPSBabelGUI.dof b/win32/gui-2/GPSBabelGUI.dof
index f3d14f90940c8a0b08e331247d8dd942fa55b215..e9e83cf25eff6f87c8febdf00eaace904c00d46c 100644 (file)
--- a/win32/gui-2/GPSBabelGUI.dof
+++ b/win32/gui-2/GPSBabelGUI.dof
@@ -56,8 +56,8 @@ IncludeVerInfo=1
 AutoIncBuild=0\r
 MajorVer=0\r
 MinorVer=2\r
-Release=3\r
-Build=4\r
+Release=4\r
+Build=0\r
 Debug=0\r
 PreRelease=0\r
 Special=0\r
@@ -68,14 +68,14 @@ CodePage=1252
 [Version Info Keys]\r
 CompanyName=GPSBabel Makers\r
 FileDescription=GPSBabel Windows Frontend\r
-FileVersion=0.2.3.4\r
+FileVersion=0.2.4\r
 InternalName=\r
 LegalCopyright=(C) 2005-2006 Olaf Klein (O.B.Klein@T-Online.de)\r
 LegalTrademarks=\r
 OriginalFilename=GPSBabelGUI.exe\r
 ProductName=GPSBabel\r
-ProductVersion=1.2.8-beta20060420_ds\r
-Comments=internal test build\r
+ProductVersion=1.3\r
+Comments=\r
 [HistoryLists\hlConditionals]\r
 Count=1\r
 Item0=MSWINDOWS\r

diff --git a/win32/gui-2/GPSBabelGUI.res b/win32/gui-2/GPSBabelGUI.res
index 5d98c3b1573ebb9d61a9b6e024254fb14af07f6b..9d20882f9b9fd759a4c1013f07e56d51e21d117d 100644 (file)
Binary files a/win32/gui-2/GPSBabelGUI.res and b/win32/gui-2/GPSBabelGUI.res differ

diff --git a/win32/gui-2/common.pas b/win32/gui-2/common.pas
index 53d6327436c2a24941ddd18db4c7f428e5148805..402828f3dc4f5c4b0de7890148600463e2dcf75f 100644 (file)
--- a/win32/gui-2/common.pas
+++ b/win32/gui-2/common.pas
@@ -358,15 +358,12 @@ var
   buff: array[0..1023] of Char;\r
   cin, cend: PChar;\r
   i: Integer;\r
-\r
   scaps: string;\r
   ext: string;\r
   comment: string;\r
   name: string;\r
   internal: string;\r
-\r
   caps: Integer;\r
-\r
   info: PFileInfo;\r
 \r
 begin\r
@@ -399,7 +396,7 @@ begin
         comment := StrPas(cin);\r
         if (Length(comment) = 0) or (Length(name) = 0) then break;\r
         \r
-        if (comment[1] = '?') then break;\r
+//      if (comment[1] = '?') then break;\r
         \r
         caps := 0;\r
         for i := 1 to Length(scaps) do\r
@@ -519,6 +516,7 @@ end;
 function TCapabilities.IsFile(Index: Integer): Boolean;\r
 var\r
   info: PFileInfo;\r
+  name: string;\r
 begin\r
   info := PFileInfo(Objects[Index]);\r
   Result := (AnsiCompareText(info.Internal, 'file') = 0);\r

diff --git a/win32/gui-2/gpsbabel.iss b/win32/gui-2/gpsbabel.iss
index 0cf06c22c7489e224faf019d046247d870545f6e..0418941e974e83603069f145460300d5049ca5e6 100644 (file)
--- a/win32/gui-2/gpsbabel.iss
+++ b/win32/gui-2/gpsbabel.iss
@@ -1,8 +1,8 @@
 ; Script generated by the Inno Setup Script Wizard.\r
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!\r
 \r
-#define Version "1.2.8"\r
-#define Release "-beta20060420_ds"\r
+#define Version "1.3"\r
+#define Release ""\r
 \r
 [Setup]\r
 AppName=GPSBabel\r
@@ -33,6 +33,7 @@ DisableStartupPrompt=true
 AppID={{E25E9E85-2244-4AB0-B00D-7F44C6E9F635}\r
 AppMutex=GPSBabelGUI_mutex\r
 OutputBaseFilename=iGPSBabel-{#Version}{#Release}\r
+UsePreviousAppDir=false\r
 \r
 [Tasks]\r
 Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked\r
@@ -44,15 +45,15 @@ Source: README.gui; DestDir: {app}
 Source: ..\..\mingw\libexpat.dll; DestDir: {app}\r
 ; Source: ..\..\mingw\sqlite3.dll; DestDir: {app}\r
 Source: ..\..\gpsbabel.exe; DestDir: {app}; Flags: comparetimestamp ignoreversion; Languages: \r
-Source: ..\..\README.xml; DestDir: {app}\r
-Source: ..\..\README.html; DestDir: {app}\r
+Source: ..\..\gpsbabel.html; DestDir: {app}; Tasks: ; Languages: \r
 Source: ..\..\COPYING; DestDir: {app}\r
 Source: ..\..\README.contrib; DestDir: {app}\r
 Source: ..\..\README.igc; DestDir: {app}\r
 Source: ..\..\README.magnav; DestDir: {app}\r
 Source: ..\..\README.mapconverter; DestDir: {app}\r
 Source: ..\..\README.psp; DestDir: {app}\r
-Source: ..\..\AUTHORS; DestDir: {app}\r
+Source: ..\..\AUTHORS; DestDir: {app}; Tasks: ; Languages: \r
+Source: ..\..\CHANGELOG; DestDir: {app}\r
 \r
 [Dirs]\r
 Name: {app}\r

diff --git a/win32/gui-2/gpsbabel.po b/win32/gui-2/gpsbabel.po
index 8f945f1312d2a71a9bd8d1925b503610f82e065b..15a42c7f0e847fb04bc2ab769f9b89bddb77533b 100644 (file)
--- a/win32/gui-2/gpsbabel.po
+++ b/win32/gui-2/gpsbabel.po
@@ -34,13 +34,10 @@ msgstr ""
 msgid "Category name (Cache)"\r
 msgstr ""\r
 \r
-msgid "Color for lines or mapnotes"\r
-msgstr ""\r
-\r
-msgid "color index [1-9] for routes"\r
+msgid "Category number to use for written waypoints"\r
 msgstr ""\r
 \r
-msgid "color index [1-9] for waypoint names"\r
+msgid "Color for lines or mapnotes"\r
 msgstr ""\r
 \r
 msgid "Command unit to power itself down"\r
@@ -64,36 +61,27 @@ msgstr ""
 msgid "Days after which points are considered old"\r
 msgstr ""\r
 \r
-msgid "Default category on output (1..16)"\r
+msgid "Decimal seconds to pause between groups of strings"\r
 msgstr ""\r
 \r
-msgid "Default icon name"\r
+msgid "Default category on output (1..16)"\r
 msgstr ""\r
 \r
-msgid "Delete all waypoints"\r
+msgid "Default icon name"\r
 msgstr ""\r
 \r
-msgid "dimmer factor of map in %"\r
+msgid "Default speed for waypoints (knots/hr)"\r
 msgstr ""\r
 \r
-msgid "Display the file header bytes"\r
+msgid "Delete all waypoints"\r
 msgstr ""\r
 \r
-msgid "Distance unit [m=metric, s=statue]"\r
+msgid "Distance unit [m=metric, s=statute]"\r
 msgstr ""\r
 \r
 msgid "Do not add geocache data to description"\r
 msgstr ""\r
 \r
-msgid "Don't write GPGGA sentences"\r
-msgstr ""\r
-\r
-msgid "Don't write GPGSA sentences"\r
-msgstr ""\r
-\r
-msgid "Don't write GPVTG sentences"\r
-msgstr ""\r
-\r
 msgid "Drop route points that do not have an equivalent waypoint (hidden points)"\r
 msgstr ""\r
 \r
@@ -103,13 +91,13 @@ msgstr ""
 msgid "Encrypt hints with ROT13"\r
 msgstr ""\r
 \r
-msgid "Export linestrings for tracks and routes"\r
+msgid "Erase device data after download"\r
 msgstr ""\r
 \r
-msgid "Export placemarks for tracks and routes"\r
+msgid "Export linestrings for tracks and routes"\r
 msgstr ""\r
 \r
-msgid "font index [1-] for waypoint names"\r
+msgid "Export placemarks for tracks and routes"\r
 msgstr ""\r
 \r
 msgid "Full path to XCSV style file"\r
@@ -175,6 +163,9 @@ msgstr ""
 msgid "Make synth. shortnames unique"\r
 msgstr ""\r
 \r
+msgid "MapSend version TRK file to generate (3,4)"\r
+msgstr ""\r
+\r
 msgid "Margin for map.  Degrees or percentage"\r
 msgstr ""\r
 \r
@@ -202,15 +193,18 @@ msgstr ""
 msgid "Merge output with existing file"\r
 msgstr ""\r
 \r
-msgid "name of map"\r
-msgstr ""\r
-\r
 msgid "Name of the 'unassigned' category"\r
 msgstr ""\r
 \r
 msgid "New name for the route"\r
 msgstr ""\r
 \r
+msgid "No separator lines between waypoints"\r
+msgstr ""\r
+\r
+msgid "No whitespace in generated shortnames"\r
+msgstr ""\r
+\r
 msgid "Non-stealth encrypted icon name"\r
 msgstr ""\r
 \r
@@ -229,9 +223,6 @@ msgstr ""
 msgid "Path to HTML style sheet"\r
 msgstr ""\r
 \r
-msgid "Pause between groups of strings"\r
-msgstr ""\r
-\r
 msgid "Precision of coordinates"\r
 msgstr ""\r
 \r
@@ -244,30 +235,42 @@ msgstr ""
 msgid "Read control points as waypoint/route/none"\r
 msgstr ""\r
 \r
+msgid "Read/Write date format (i.e. DDMMYYYY)"\r
+msgstr ""\r
+\r
 msgid "Read/Write date format (i.e. yyyy/mm/dd)"\r
 msgstr ""\r
 \r
+msgid "Read/write GPGGA sentences"\r
+msgstr ""\r
+\r
+msgid "Read/write GPGSA sentences"\r
+msgstr ""\r
+\r
+msgid "Read/write GPRMC sentences"\r
+msgstr ""\r
+\r
+msgid "Read/write GPVTG sentences"\r
+msgstr ""\r
+\r
 msgid "Read/Write time format (i.e. HH:mm:ss xx)"\r
 msgstr ""\r
 \r
 msgid "Return current position as a waypoint"\r
 msgstr ""\r
 \r
-msgid "set text background to transparent"\r
+msgid "Road type changes"\r
 msgstr ""\r
 \r
 msgid "Shortname is MAC address"\r
 msgstr ""\r
 \r
-msgid "size index [101-] for routes"\r
+msgid "Split input into separate files"\r
 msgstr ""\r
 \r
 msgid "Split into multiple routes at turns"\r
 msgstr ""\r
 \r
-msgid "State map format to write, default=CA"\r
-msgstr ""\r
-\r
 msgid "Stealth encrypted icon name"\r
 msgstr ""\r
 \r
@@ -301,16 +304,13 @@ msgstr ""
 msgid "Target GPX version for output"\r
 msgstr ""\r
 \r
-msgid "Temperature unit [c=celsius, f=fahrenheit]"\r
-msgstr ""\r
-\r
-msgid "text size [101-] for waypoint names"\r
+msgid "Temperature unit [c=Celsius, f=Fahrenheit]"\r
 msgstr ""\r
 \r
 msgid "The icon description is already the marker"\r
 msgstr ""\r
 \r
-msgid "Type of .an1 file (see README)"\r
+msgid "Type of .an1 file"\r
 msgstr ""\r
 \r
 msgid "UPPERCASE synth. shortnames"\r
@@ -319,9 +319,6 @@ msgstr ""
 msgid "Use depth values on output (default is ignore)"\r
 msgstr ""\r
 \r
-msgid "use file of parameters (parameters on command line overwrites file parameters)"\r
-msgstr ""\r
-\r
 msgid "Use proximity values on output (default is ignore)"\r
 msgstr ""\r
 \r
@@ -340,7 +337,7 @@ msgstr ""
 msgid "Waypoint foreground color"\r
 msgstr ""\r
 \r
-msgid "Waypoint type (marker,text,mapnote,circle)"\r
+msgid "Waypoint type"\r
 msgstr ""\r
 \r
 msgid "Width in pixels of map"\r
@@ -349,18 +346,12 @@ msgstr ""
 msgid "Width of lines, in pixels"\r
 msgstr ""\r
 \r
-msgid "Write GPRMC sentences"\r
-msgstr ""\r
-\r
 msgid "Write timestamps with offset x to UTC time"\r
 msgstr ""\r
 \r
 msgid "Write tracks compatible with Carto Exploreur"\r
 msgstr ""\r
 \r
-msgid "zoom factor of map in %"\r
-msgstr ""\r
-\r
 msgid "Zoom level to reduce points"\r
 msgstr ""\r
 \r

diff --git a/win32/gui-2/main.pas b/win32/gui-2/main.pas
index 44c578746fb6e1f34845aabf6e43a57bb754a844..60bddbb07b9c80295073806daa0b1fd17dc4845d 100644 (file)
--- a/win32/gui-2/main.pas
+++ b/win32/gui-2/main.pas
@@ -372,7 +372,7 @@ begin
   LoadFileFormats;\r
 \r
   // ? valid README form\r
-  s := ExtractFilePath(ParamStr(0)) + 'readme.html';\r
+  s := ExtractFilePath(ParamStr(0)) + 'gpsbabel.html';\r
   acHelpReadme.Enabled := FileExists(s) or (frmReadme.Memo.Lines.Count > 0);\r
 end;\r
 \r
@@ -907,9 +907,9 @@ procedure TfrmMain.acHelpReadmeExecute(Sender: TObject);
 var\r
   s: string;\r
 begin\r
-  s := ExtractFilePath(ParamStr(0)) + 'readme.html';\r
+  s := ExtractFilePath(ParamStr(0)) + 'gpsbabel.html';\r
   if FileExists(s) then\r
-    WinOpenFile(s, '')   // new readme.html\r
+    WinOpenFile(s, '')   // new gpsbabel.html\r
   else begin // show the old readme\r
     if (frmReadme = nil) then\r
       Application.CreateForm(TfrmReadme, frmReadme);\r

diff --git a/win32/gui-2/options.pas b/win32/gui-2/options.pas
index a8953bddcd35436b76e586aad2478a48547d0eaf..6eb98c2d7a5d872be69655e43a43f5d5fefbae09 100644 (file)
--- a/win32/gui-2/options.pas
+++ b/win32/gui-2/options.pas
@@ -237,7 +237,8 @@ begin
       1: CreateIntegerOption(xy.X, xy.Y - 2, i + 1, o, xmax);\r
       2, 3: CreateStringOption(xy.X, xy.Y - 2, i + 1, o, xmax);\r
       4: ;\r
-      5: if FIsInput then CreateFileOption(xy.X, xy.Y - 2, i + 1, o, True, xmax);\r
+      5: // ??? if FIsInput then\r
+        CreateFileOption(xy.X, xy.Y - 2, i + 1, o, True, xmax);\r
       6: if not FIsInput then CreateFileOption(xy.X, xy.Y - 2, i + 1, o, False, xmax);\r
     end;\r
     if (o.edit <> nil) then\r
@@ -468,7 +469,7 @@ end;
 \r
 procedure TfrmOptions.btnHelpClick(Sender: TObject);\r
 begin\r
-  WinOpenURL(readme_html_path + '#' + FFormat);\r
+  WinOpenURL(readme_html_path + '#fmt_' + FFormat);\r
 end;\r
 \r
 procedure TfrmOptions.CreateFileOption(const x, y, tag: Integer; o: POption; IsInput: Boolean; xmax: Integer = -1);\r

diff --git a/win32/gui-2/utils.pas b/win32/gui-2/utils.pas
index 427502ae5f057ecd52cb3e3231ef07fb77a135e0..651dacf3d196cf6e5b53a1cf2936f3a4858698f2 100644 (file)
--- a/win32/gui-2/utils.pas
+++ b/win32/gui-2/utils.pas
@@ -394,7 +394,7 @@ end;
 \r
 function readme_html_path: string;\r
 begin\r
-  Result := ExtractFilePath(ParamStr(0)) + 'readme.html';\r
+  Result := ExtractFilePath(ParamStr(0)) + 'gpsbabel.html';\r
   if FileExists(Result) then\r
   begin\r
     while (Pos('\', Result) <> 0) do\r
@@ -402,7 +402,7 @@ begin
     Result := 'file:///' + Result;\r
   end\r
   else\r
-    Result := SGPSBabelURL + '/readme.html';\r
+    Result := SGPSBabelURL + '/gpsbabel.html';\r
 end;\r
 \r
 function HasUpDown(E: TEdit; var UpDown: TUpdown): Boolean;\r